Skip to content

OCPBUGS-84512: Updates aws external CCM terminationMessagePolicy#80840

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
theobarberbany:tb/845142
Jun 22, 2026
Merged

OCPBUGS-84512: Updates aws external CCM terminationMessagePolicy#80840
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
theobarberbany:tb/845142

Conversation

@theobarberbany

@theobarberbany theobarberbany commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

We're seeing CI fail because we don't set terminationMessagePolicy: FallbackToLogsOnError

This fixes how we deploy the external CCM for aws.

See https://redhat.atlassian.net/browse/OCPBUGS-84512 for additional context.

Summary by CodeRabbit

This PR updates the OpenShift CI infrastructure configuration for the AWS external Cloud Controller Manager (CCM) deployment. Specifically, it adds the terminationMessagePolicy: FallbackToLogsOnError setting to the container specification in the CCM deployment manifest generated by the step registry script.

The change addresses CI failures by ensuring that container termination messages are properly captured in logs when the external CCM pod terminates. The modification is minimal—a single line addition to the deployment configuration script—and does not alter any other manifest content or control flow logic.

File changed:

  • ci-operator/step-registry/platform-external/ccm/conf/aws/platform-external-ccm-conf-aws-commands.sh (+1 line)

This is an infrastructure-focused change that improves the reliability and debuggability of the external CCM deployment on OpenShift clusters using AWS.

Note: The PR references Jira issue OCPBUGS-84512, which the CI bot flagged as lacking a target version assignment (expected "5.0.0"). The validation warning does not block the PR, but the underlying Jira issue may need to be updated with the appropriate version targeting.

We're seeing CI fail because we don't set terminationMessagePolicy: FallbackToLogsOnError

This fixes how we deploy the external CCM for aws.

See https://redhat.atlassian.net/browse/OCPBUGS-84512 for additional
context.
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@theobarberbany: This pull request references Jira Issue OCPBUGS-84512, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

We're seeing CI fail because we don't set terminationMessagePolicy: FallbackToLogsOnError

This fixes how we deploy the external CCM for aws.

See https://redhat.atlassian.net/browse/OCPBUGS-84512 for additional context.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a700bb8e-4630-4ad7-9e3b-d350dd3e0c0d

📥 Commits

Reviewing files that changed from the base of the PR and between c985bbf and 2b717ad.

📒 Files selected for processing (1)
  • ci-operator/step-registry/platform-external/ccm/conf/aws/platform-external-ccm-conf-aws-commands.sh

Walkthrough

A single line is added to the AWS external CCM configuration shell script, setting terminationMessagePolicy: FallbackToLogsOnError on the CCM container spec within the generated deployment manifest. No other logic or content is changed.

Changes

AWS External CCM Container Spec

Layer / File(s) Summary
CCM container terminationMessagePolicy
ci-operator/step-registry/platform-external/ccm/conf/aws/platform-external-ccm-conf-aws-commands.sh
Adds terminationMessagePolicy: FallbackToLogsOnError to the CCM container spec in the generated manifest.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Topology-Aware Scheduling Compatibility ⚠️ Warning The deployment manifest introduces multiple topology-hostile patterns: nodeSelector targeting control-plane nodes (breaks HyperShift), required pod anti-affinity with hostname key (deadlocks on 2-n... Add topology awareness: detect ControlPlaneTopology to cap replicas appropriately, avoid nodeSelector on master nodes (target via toleration+taint instead), or check for external topology. Use topology-specific CI jobs to verify before m...
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and specifically describes the main change: updating the AWS external CCM's terminationMessagePolicy configuration.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only a bash script that generates Kubernetes manifests; contains no Ginkgo test code, so the test-name stability check does not apply.
Test Structure And Quality ✅ Passed This PR modifies only a shell script that generates Kubernetes deployment manifests, not Ginkgo test code. The custom check for Ginkgo test quality is not applicable to this PR.
Microshift Test Compatibility ✅ Passed PR modifies only a deployment configuration bash script with no Ginkgo e2e tests; MicroShift compatibility check applies only to new e2e test additions.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. The change is a bash script modification that adds a deployment configuration setting. The SNO test compatibility check is not applicable.
Ote Binary Stdout Contract ✅ Passed This PR modifies a shell script that generates Kubernetes manifests, not an OTE binary. The check targets OTE binaries with JSON stdout contracts; this is infrastructure configuration with no stdou...
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies a bash shell script (platform-external-ccm-conf-aws-commands.sh) that generates Kubernetes manifests, not Ginkgo e2e tests. The check is not applicable as it targets tests with IPv...
No-Weak-Crypto ✅ Passed The PR adds a Kubernetes container termination message policy configuration. No weak cryptography patterns (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementations, or insecure sec...
Container-Privileges ✅ Passed PR only adds terminationMessagePolicy setting; no privilege escalation flags like privileged, hostPID, hostIPC, SYS_ADMIN, or allowPrivilegeEscalation are introduced.
No-Sensitive-Data-In-Logs ✅ Passed The PR adds only terminationMessagePolicy: FallbackToLogsOnError to a Kubernetes deployment manifest. No sensitive data (passwords, tokens, API keys, PII, credentials) is exposed in the CCM conta...

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from elmiko and rvanderp3 June 22, 2026 14:10
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@theobarberbany: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-kubernetes-master-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-5.1-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-5.0-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.23-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.22-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.21-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.20-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.19-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-kubernetes-release-4.18-e2e-external-aws-ccm openshift/kubernetes presubmit Registry content changed
pull-ci-openshift-installer-main-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-main-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.1-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.1-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.0-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-5.0-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.23-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.23-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.22-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.22-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.21-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.21-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.20-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.20-e2e-external-aws-ccm openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.19-e2e-external-aws openshift/installer presubmit Registry content changed
pull-ci-openshift-installer-release-4.19-e2e-external-aws-ccm openshift/installer presubmit Registry content changed

A total of 96 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@theobarberbany

Copy link
Copy Markdown
Contributor Author

/pj-rehearse skip

Not worth the CI cost.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@theobarberbany: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 22, 2026

@elmiko elmiko left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2026
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko, theobarberbany

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2026
@theobarberbany

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 22, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@theobarberbany: This pull request references Jira Issue OCPBUGS-84512, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot Bot merged commit 03532bb into openshift:main Jun 22, 2026
8 of 10 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@theobarberbany: Jira Issue OCPBUGS-84512: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-84512 has been moved to the MODIFIED state.

Details

In response to this:

We're seeing CI fail because we don't set terminationMessagePolicy: FallbackToLogsOnError

This fixes how we deploy the external CCM for aws.

See https://redhat.atlassian.net/browse/OCPBUGS-84512 for additional context.

Summary by CodeRabbit

This PR updates the OpenShift CI infrastructure configuration for the AWS external Cloud Controller Manager (CCM) deployment. Specifically, it adds the terminationMessagePolicy: FallbackToLogsOnError setting to the container specification in the CCM deployment manifest generated by the step registry script.

The change addresses CI failures by ensuring that container termination messages are properly captured in logs when the external CCM pod terminates. The modification is minimal—a single line addition to the deployment configuration script—and does not alter any other manifest content or control flow logic.

File changed:

  • ci-operator/step-registry/platform-external/ccm/conf/aws/platform-external-ccm-conf-aws-commands.sh (+1 line)

This is an infrastructure-focused change that improves the reliability and debuggability of the external CCM deployment on OpenShift clusters using AWS.

Note: The PR references Jira issue OCPBUGS-84512, which the CI bot flagged as lacking a target version assignment (expected "5.0.0"). The validation warning does not block the PR, but the underlying Jira issue may need to be updated with the appropriate version targeting.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants